Make XInput 2 builds work without cairo

* src/xterm.c: Move some defines around so XI2 code doesn't
get ifdef'd out if Cairo is disabled.

diff --git a/src/xterm.c b/src/xterm.c
index 0a3aeeed7035e51bc1919acc0471eaba03e22657..821c92c4dda15466466bfe84e0d6a2c6ef68e0a6 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -345,6 +345,7 @@ x_extension_initialize (struct x_display_info *dpyinfo)
   dpyinfo->ext_codes = ext_codes;
 }
 
+#endif /* HAVE_CAIRO */
 
 #ifdef HAVE_XINPUT2
 
@@ -564,6 +565,8 @@ xi_reset_scroll_valuators_for_device_id (struct x_display_info *dpyinfo, int id)
 
 #endif
 
+#ifdef USE_CAIRO
+
 void
 x_cr_destroy_frame_context (struct frame *f)
 {